From: Jan Beulich Date: Wed, 5 Feb 2020 12:51:56 +0000 (+0100) Subject: x86/HVM: rename a variable in __hvm_copy() X-Git-Tag: archive/raspbian/4.14.0+80-gd101b417b7-1+rpi1^2~63^2~748 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=22f5696e6a6ba328f275f4249886aa739c5c716f;p=xen.git x86/HVM: rename a variable in __hvm_copy() This is to reflect its actual purpose. Also use in a 2nd place. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 2fee569a5f..fc66d72eac 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -3255,9 +3255,9 @@ static enum hvm_translation_result __hvm_copy( while ( todo > 0 ) { enum hvm_translation_result res; - paddr_t gpa = addr & ~PAGE_MASK; + unsigned int pgoff = addr & ~PAGE_MASK; - count = min_t(int, PAGE_SIZE - gpa, todo); + count = min_t(int, PAGE_SIZE - pgoff, todo); res = hvm_translate_get_page(v, addr, flags & HVMCOPY_linear, pfec, pfinfo, &page, &gfn, &p2mt); @@ -3279,7 +3279,7 @@ static enum hvm_translation_result __hvm_copy( return HVMTRANS_need_retry; } - p = (char *)__map_domain_page(page) + (addr & ~PAGE_MASK); + p = __map_domain_page(page) + pgoff; if ( flags & HVMCOPY_to_guest ) {